Explicitly link against Xrender. (#327538, Christophe Belle)

2006-01-19  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Explicitly link against Xrender.
	(#327538, Christophe Belle)

diff --git a/ChangeLog b/ChangeLog
index a47ed0f679b8ed68cf42a5edcfad6757de1b225e..86e8bc4577c541227a6f9cd2b67a032f104e14fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-19  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Explicitly link against Xrender.  
+       (#327538, Christophe Belle)
+       
        * gdk/x11/gdkprivate-x11.h (XID_FONT_BIT): 
        * gdk/x11/gdkfont-x11.c: 
        * gdk/x11/gdkxid.c: Use an unused high bit in the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a47ed0f679b8ed68cf42a5edcfad6757de1b225e..86e8bc4577c541227a6f9cd2b67a032f104e14fa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-01-19  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Explicitly link against Xrender.  
+       (#327538, Christophe Belle)
+       
        * gdk/x11/gdkprivate-x11.h (XID_FONT_BIT): 
        * gdk/x11/gdkfont-x11.c: 
        * gdk/x11/gdkxid.c: Use an unused high bit in the

diff --git a/configure.in b/configure.in
index b4eb50a5737c243a0546b95dbbc49cc2e858e40e..beabb8b712fb35c74e33a102ed20892e6772dd0b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1045,11 +1045,11 @@ if test "x$gdktarget" = "xx11"; then
   #
   # Check for basic X packages; we use pkg-config if available
   #
-  if $PKG_CONFIG --exists x11 xext; then
+  if $PKG_CONFIG --exists x11 xext xrender; then
     have_base_x_pc=true
-    X_PACKAGES="$X_PACKAGES x11 xext"
-    x_libs="`pkg-config --libs x11 xext`"
-    X_CFLAGS="`pkg-config --cflags x11 xext`"
+    X_PACKAGES="$X_PACKAGES x11 xext xrender"
+    x_libs="`pkg-config --libs x11 xext xrender`"
+    X_CFLAGS="`pkg-config --cflags x11 xext xrender`"
     
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
@@ -1071,11 +1071,11 @@ if test "x$gdktarget" = "xx11"; then
     fi
     
     x_cflags="$X_CFLAGS"
-    x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+    x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
 
     GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
     GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
-    GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
+    GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
   fi
 
   # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
@@ -1094,6 +1094,8 @@ if test "x$gdktarget" = "xx11"; then
                 AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
   AC_CHECK_FUNC(XextFindDisplay, :,
                 AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
+  AC_CHECK_FUNC(XRenderQueryExtension, :,
+                AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
 
   # Check for xReply